made peace with

与…言归于好;与…讲和;休战